From: Ludovic CHEVALIER Date: Mon, 1 Feb 2016 16:25:40 +0000 (+0100) Subject: [PYTHON] ~fix membership state, start and stop date must X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/%22%7B%24link%5B%27href%27%5D%7D/%40%20%27icone_configuration%27%20=%3E%20%27Configuration%27%2C%20%27icone_creer_auteur%27%20=%3E%20%27Create%20a%20new%20author%20and%20associate%20him/her%20with%20this%20article%27%2C%20%27icone_creer_mot_cle%27%20=%3E%20%27Create%20a%20new%20keyword%20and%20link%20it%20to%20this%20article%27%2C-%27icone_creer_mot_cle_rubrique%27%20=%3E%20%27Create%20a%20new%20keyword%20and%20attach%20it%20to%20this%20section%27%2C-%27icone_creer_mot_cle_site%27%20=%3E%20%27Create%20a%20new%20keyword%20and%20attach%20it%20to%20this%20site%27%2C%20%27icone_creer_rubrique_2%27%20=%3E%20%27Create%20a%20new%20section%27%2C%20%27icone_edition%27%20=%3E%20%27Edit%27%2C-%27icone_envoyer_message%27%20=%3E%20%27Send%20this%20message%27%2C%20%27icone_ma_langue%27%20=%3E%20%27My%20language%27%2C%20%27icone_mes_infos%27%20=%3E%20%27My%20details%27%2C%20%27icone_mes_preferences%27%20=%3E%20%27Preferences%27%2C%20%27icone_modifier_article%27%20=%3E%20%27Edit%20this%20article%27%2C-%27icone_modifier_message%27%20=%3E%20%27Edit%20this%20message%27%2C%20%27icone_modifier_rubrique%27%20=%3E%20%27Edit%20this%20section%27%2C%20%27icone_publication%27%20=%3E%20%27Publish%27%2C%20%27icone_relancer_signataire%27%20=%3E%20%27Contact%20the%20signatory%20again%27%2C%40%40%20-220%2C15%20%20188%2C11%20%40%40%20Do%20not%20submit%20this%20import%20request.%3Cp%3EFor%20more%20information%2C%20please%20see%20%3Ca%20href=?a=commitdiff_plain;h=73b080e4996f56e1984f76b43c669c687329b7fd;p=burette%2Fpos_membership.git [PYTHON] ~fix membership state, start and stop date must not be calculated from the parent member for associated members --- diff --git a/pos_membership.py b/pos_membership.py index 6a936d2..a37bc52 100644 --- a/pos_membership.py +++ b/pos_membership.py @@ -478,9 +478,6 @@ class Partner(osv.osv): res[id] = 'none' if partner_data.free_member and s != 0: res[id] = 'free' - if partner_data.associate_member: - res_state = self._membership_state(cr, uid, [partner_data.associate_member.id], name, args, context=context) - res[id] = res_state[partner_data.associate_member.id] return res def _membership_date(self, cr, uid, ids, name, args, context=None): @@ -489,10 +486,7 @@ class Partner(osv.osv): res = {} member_line_obj = self.pool.get('membership.membership_line') for partner in self.browse(cr, uid, ids, context=context): - if partner.associate_member: - partner_id = partner.associate_member.id - else: - partner_id = partner.id + partner_id = partner.id res[partner.id] = { 'membership_start': False, 'membership_stop': False,